From 65ade46c57d850062d246470a3552bb026a8f602 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 1 Dec 2006 13:44:33 +0000 Subject: [PATCH] [LINUX] dev/mem: Rename Xen's mmap_mem to xen_mmap_mem to avoid conflict with the definition (which still exists and is used) in drivers/char/mem.c. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/drivers/xen/char/mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/char/mem.c b/linux-2.6-xen-sparse/drivers/xen/char/mem.c index ac85c8dbb2..135bad413e 100644 --- a/linux-2.6-xen-sparse/drivers/xen/char/mem.c +++ b/linux-2.6-xen-sparse/drivers/xen/char/mem.c @@ -147,7 +147,7 @@ static inline int uncached_access(struct file *file) return 0; } -static int mmap_mem(struct file * file, struct vm_area_struct * vma) +static int xen_mmap_mem(struct file * file, struct vm_area_struct * vma) { size_t size = vma->vm_end - vma->vm_start; @@ -200,6 +200,6 @@ struct file_operations mem_fops = { .llseek = memory_lseek, .read = read_mem, .write = write_mem, - .mmap = mmap_mem, + .mmap = xen_mmap_mem, .open = open_mem, }; -- 2.30.2